Move filter-line-parsing code to a separate file
This code is not specific to V2 of the protocol, so it doesn't belong there. Move it to its own class. Change-Id: I8084764147d1d0e2bceaaead59b332a8ec1a0825 Signed-off-by: Matthew DeVore <matvore@gmail.com>
This commit is contained in:
Matthew DeVore
parent
47e37b0fa4
commit
c490373e00
|
|
@ -0,0 +1,98 @@
|
|||
/*
|
||||
* Copyright (C) 2019, Google LLC.
|
||||
* and other copyright owners as documented in the project's IP log.
|
||||
*
|
||||
* This program and the accompanying materials are made available
|
||||
* under the terms of the Eclipse Distribution License v1.0 which
|
||||
* accompanies this distribution, is reproduced below, and is
|
||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||
*
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or
|
||||
* without modification, are permitted provided that the following
|
||||
* conditions are met:
|
||||
*
|
||||
* - Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* - Redistributions in binary form must reproduce the above
|
||||
* copyright notice, this list of conditions and the following
|
||||
* disclaimer in the documentation and/or other materials provided
|
||||
* with the distribution.
|
||||
*
|
||||
* - Neither the name of the Eclipse Foundation, Inc. nor the
|
||||
* names of its contributors may be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
|
||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
package org.eclipse.jgit.transport;
|
||||
|
||||
import java.text.MessageFormat;
|
||||
|
||||
import org.eclipse.jgit.errors.PackProtocolException;
|
||||
import org.eclipse.jgit.internal.JGitText;
|
||||
|
||||
/**
|
||||
* Utility code for dealing with filter lines.
|
||||
*/
|
||||
final class FilterSpec {
|
||||
|
||||
private FilterSpec() {}
|
||||
|
||||
/*
|
||||
* Process the content of "filter" line from the protocol. It has a shape
|
||||
* like "blob:none" or "blob:limit=N", with limit a positive number.
|
||||
*
|
||||
* @param filterLine
|
||||
* the content of the "filter" line in the protocol
|
||||
* @return N, the limit, defaulting to 0 if "none"
|
||||
* @throws PackProtocolException
|
||||
* invalid filter because due to unrecognized format or
|
||||
* negative/non-numeric filter.
|
||||
*/
|
||||
static long parseFilterLine(String filterLine)
|
||||
throws PackProtocolException {
|
||||
long blobLimit = -1;
|
||||
|
||||
if (filterLine.equals("blob:none")) { //$NON-NLS-1$
|
||||
blobLimit = 0;
|
||||
} else if (filterLine.startsWith("blob:limit=")) { //$NON-NLS-1$
|
||||
try {
|
||||
blobLimit = Long
|
||||
.parseLong(filterLine.substring("blob:limit=".length())); //$NON-NLS-1$
|
||||
} catch (NumberFormatException e) {
|
||||
throw new PackProtocolException(MessageFormat
|
||||
.format(JGitText.get().invalidFilter, filterLine));
|
||||
}
|
||||
}
|
||||
/*
|
||||
* We must have (1) either "blob:none" or "blob:limit=" set (because we
|
||||
* only support blob size limits for now), and (2) if the latter, then
|
||||
* it must be nonnegative. Throw if (1) or (2) is not met.
|
||||
*/
|
||||
if (blobLimit < 0) {
|
||||
throw new PackProtocolException(
|
||||
MessageFormat.format(
|
||||
JGitText.get().invalidFilter, filterLine));
|
||||
}
|
||||
|
||||
return blobLimit;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -130,7 +130,7 @@ FetchV0Request recvWants(PacketLineIn pckIn)
|
|||
}
|
||||
filterReceived = true;
|
||||
|
||||
reqBuilder.setFilterBlobLimit(ProtocolV2Parser.filterLine(arg));
|
||||
reqBuilder.setFilterBlobLimit(FilterSpec.parseFilterLine(arg));
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ FetchV2Request parseFetchRequest(PacketLineIn pckIn)
|
|||
JGitText.get().tooManyFilters);
|
||||
}
|
||||
filterReceived = true;
|
||||
reqBuilder.setFilterBlobLimit(filterLine(
|
||||
reqBuilder.setFilterBlobLimit(FilterSpec.parseFilterLine(
|
||||
line.substring(OPTION_FILTER.length() + 1)));
|
||||
} else {
|
||||
throw new PackProtocolException(MessageFormat
|
||||
|
|
@ -269,42 +269,4 @@ LsRefsV2Request parseLsRefsRequest(PacketLineIn pckIn)
|
|||
return builder.setRefPrefixes(prefixes).build();
|
||||
}
|
||||
|
||||
/*
|
||||
* Process the content of "filter" line from the protocol. It has a shape
|
||||
* like "blob:none" or "blob:limit=N", with limit a positive number.
|
||||
*
|
||||
* @param blobLine
|
||||
* the content of the "filter" line in the protocol
|
||||
* @return N, the limit, defaulting to 0 if "none"
|
||||
* @throws PackProtocolException
|
||||
* invalid filter because due to unrecognized format or
|
||||
* negative/non-numeric filter.
|
||||
*/
|
||||
static long filterLine(String blobLine) throws PackProtocolException {
|
||||
long blobLimit = -1;
|
||||
|
||||
if (blobLine.equals("blob:none")) { //$NON-NLS-1$
|
||||
blobLimit = 0;
|
||||
} else if (blobLine.startsWith("blob:limit=")) { //$NON-NLS-1$
|
||||
try {
|
||||
blobLimit = Long
|
||||
.parseLong(blobLine.substring("blob:limit=".length())); //$NON-NLS-1$
|
||||
} catch (NumberFormatException e) {
|
||||
throw new PackProtocolException(MessageFormat
|
||||
.format(JGitText.get().invalidFilter, blobLine));
|
||||
}
|
||||
}
|
||||
/*
|
||||
* We must have (1) either "blob:none" or "blob:limit=" set (because we
|
||||
* only support blob size limits for now), and (2) if the latter, then
|
||||
* it must be nonnegative. Throw if (1) or (2) is not met.
|
||||
*/
|
||||
if (blobLimit < 0) {
|
||||
throw new PackProtocolException(
|
||||
MessageFormat.format(JGitText.get().invalidFilter, blobLine));
|
||||
}
|
||||
|
||||
return blobLimit;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue