Skip to content

Small polish and update SDK and other pom properties #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Small polish and update SDK and other pom properties #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
659c2b7
Sall polish and change the loop cycle. Because it is really so hard t…
Apr 5, 2018
3e3038d
Set UTF-8 for build, just clean warning from SDK notifications
Apr 5, 2018
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
4 changes: 3 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@
<properties>
<bitbucket.version>5.0.1</bitbucket.version>
<bitbucket.data.version>${bitbucket.version}</bitbucket.data.version>
<amps.version>6.3.0</amps.version>
<amps.version>6.3.15</amps.version>
<plugin.testrunner.version>1.2.3</plugin.testrunner.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
</project>
108 changes: 55 additions & 53 deletions src/main/java/networkservlet/NetworkServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@

public class NetworkServlet extends HttpServlet {

static final String NETWORK_PAGE = "bitbucket.plugin.network";
static final String NETWORK_PAGE_FRAGMENT = "bitbucket.plugin.network_fragment";
private static final String NETWORK_PAGE = "bitbucket.plugin.network";
private static final String NETWORK_PAGE_FRAGMENT = "bitbucket.plugin.network_fragment";

private final RepositoryService repositoryService;
private final CommitEnricher commitEnricher;
Expand All @@ -62,7 +62,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
// Get repoSlug from path
String pathInfo = req.getPathInfo();
String[] components = pathInfo.split("/");
Boolean contentsOnly = !(req.getParameter("contentsOnly") == null);
Boolean contentsOnly = req.getParameter("contentsOnly") != null;
String pageStr = req.getParameter("page");
Integer page = Math.max(Integer.parseInt(pageStr == null ? "0" : pageStr), 1) - 1;
final Integer limit = 50;
Expand Down Expand Up @@ -94,68 +94,70 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
protected Map<String, List<Ref>> getLabels(Repository repository) throws IOException {
final Map<String, List<Ref>> labels = new HashMap<>();
SingleLineOutputHandler sloh = new SingleLineOutputHandler();
GitScmCommandBuilder showRef = gitScm.getCommandBuilderFactory().builder( repository ).command("show-ref");
showRef.argumentAt(0, "--heads" );
showRef.argumentAt(1, "--tags" );
GitScmCommandBuilder showRef = gitScm.getCommandBuilderFactory().builder(repository).command("show-ref");
showRef.argumentAt(0, "--heads");
showRef.argumentAt(1, "--tags");
showRef.argumentAt(2, "--dereference");
GitCommand<String> showRefCmd = showRef.build(sloh);
String result = showRefCmd.synchronous().call();
if (result != null) {
StringReader r = new StringReader(result);
BufferedReader br = new BufferedReader(r);
String line;

// Loop through 1st time to construct ArrayLists.
while ((line = br.readLine()) != null) {
if (line.length() > 40) {
String hash = line.substring(0, 40);
labels.put(hash, new ArrayList<>());
}
if (result == null) {
return labels;
}

StringReader r = new StringReader(result);
BufferedReader br = new BufferedReader(r);
String line;

// Loop through 1st time to construct ArrayLists.
while ((line = br.readLine()) != null) {
if (line.length() > 40) {
String hash = line.substring(0, 40);
labels.put(hash, new ArrayList<>());
}
}

// Loop through a 2nd time to fill them.
r = new StringReader(result);
br = new BufferedReader(r);
while ((line = br.readLine()) != null) {
if (line.length() > 40) {
Ref ref;
String hash = line.substring(0, 40);
String id = line.substring(41).trim();
if (id.endsWith("^{}")) {
id = id.substring(0, id.length() - 3);
}
if (id.startsWith("refs/tags/")) {
String displayId = id.substring("refs/tags/".length());
ref = new SimpleTag.Builder().hash(hash).displayId(displayId).id(id).latestCommit(hash).build();
} else {
String displayId = id.substring("refs/heads/".length());
ref = new SimpleBranch.Builder().displayId(displayId).id(id).latestCommit(hash).build();
}
labels.get(hash).add(ref);
// Loop through a 2nd time to fill them.
r = new StringReader(result);
br = new BufferedReader(r);
while ((line = br.readLine()) != null) {
if (line.length() > 40) {
Ref ref;
String hash = line.substring(0, 40);
String id = line.substring(41).trim();
if (id.endsWith("^{}")) {
id = id.substring(0, id.length() - 3);
}
if (id.startsWith("refs/tags/")) {
String displayId = id.substring("refs/tags/".length());
ref = new SimpleTag.Builder().hash(hash).displayId(displayId).id(id).latestCommit(hash).build();
} else {
String displayId = id.substring("refs/heads/".length());
ref = new SimpleBranch.Builder().displayId(displayId).id(id).latestCommit(hash).build();
}
labels.get(hash).add(ref);
}
}
return labels;
}

protected Page<Commit> getCommits(final Repository repository,
final Integer limit,
final Integer offset) {
PageRequest pr = new PageRequestImpl( offset, limit );
pr = pr.buildRestrictedPageRequest( 50 );
CommitsCommandParameters ccp = new CommitsCommandParameters.Builder().all( true ).build();
PagedCommitOutputHandler pcoh = new PagedCommitOutputHandler( repository, ccp, pr );
final Integer limit,
final Integer offset) {
PageRequest pr = new PageRequestImpl(offset, limit);
pr = pr.buildRestrictedPageRequest(50);
CommitsCommandParameters ccp = new CommitsCommandParameters.Builder().all(true).build();
PagedCommitOutputHandler pcoh = new PagedCommitOutputHandler(repository, ccp, pr);
GitScmCommandBuilder revList = gitScm.getCommandBuilderFactory().builder(repository).command("rev-list");
revList.argumentAt(0, "--pretty=" + pcoh.getCommitReader().getFormat() );
revList.argumentAt(1, "--branches=*" );
revList.argumentAt(2, "--tags=*" );
revList.argumentAt(3, "--topo-order" );
revList.argumentAt(0, "--pretty=" + pcoh.getCommitReader().getFormat());
revList.argumentAt(1, "--branches=*");
revList.argumentAt(2, "--tags=*");
revList.argumentAt(3, "--date-order");
GitCommand<Page<Commit>> revListCmd = revList.build(pcoh);
Page<Commit> commits = revListCmd.synchronous().call();
if ( commits == null ) {
commits = PageUtils.createEmptyPage( pr );
if (commits == null) {
commits = PageUtils.createEmptyPage(pr);
} else {
commits = commitEnricher.enrichPage(repository, commits, Collections.<String>emptySet());
commits = commitEnricher.enrichPage(repository, commits, Collections.emptySet());
}
return commits;
}
Expand All @@ -164,10 +166,10 @@ protected void render(HttpServletResponse resp, String templateName, Map<String,
resp.setContentType("text/html;charset=UTF-8");
try {
soyTemplateRenderer.render(
resp.getWriter(),
"com.plugin.commitgraph.commitgraph:network-soy-templates",
templateName,
data
resp.getWriter(),
"com.plugin.commitgraph.commitgraph:network-soy-templates",
templateName,
data
);
} catch (SoyException e) {
Throwable cause = e.getCause();
Expand Down
11 changes: 2 additions & 9 deletions src/main/java/networkservlet/PagedCommitOutputHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public PagedCommitOutputHandler( Repository repository, CommitsCommandParameters
commitReaderSettingsBuilder.withMessages(parameters.isWithMessages());
this.commitReader = new CommitReader( commitReaderSettingsBuilder.build() )
{
@Override
protected void ping()
{
PagedCommitOutputHandler.this.resetWatchdog();
Expand Down Expand Up @@ -60,15 +61,7 @@ protected Commit readCommit( LineReader reader ) throws IOException
protected void processReader( LineReader reader ) throws IOException
{
int count = 0;

while ( true )
{
Commit commit = readCommit( reader );
if ( commit == null )
{
break;
}

for (Commit commit = readCommit( reader ); commit !=null; commit = readCommit( reader )){
if ( count++ >= this.pageRequest.getStart() )
{
this.commits.add( commit );
Expand Down