Skip to content

Commit

Permalink
chore(datahandler): Fix typo Repostitory to Repository
Browse files Browse the repository at this point in the history 
Signed-off-by: Thomas Maier <thomas.maier@evosoft.com>
  • Loading branch information
@maierthomas
maierthomas committed Jun 15, 2018
1 parent c3359b4 commit e480824
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 32 deletions.
34 changes: 17 additions & 17 deletions ...rters/component-importer/src/main/java/org/eclipse/sw360/importer/ComponentCSVRecord.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public class ComponentCSVRecord extends ComponentAwareCSVRecord {
private final String CPEId;
private final String releaseCreatedOn;
private final String releaseCreatedBy;
private final String releaseRepostitoryURL;
private final String releaseRepostitoryType;
private final String releaseRepositoryURL;
private final String releaseRepositoryType;
private final String releaseMainlineState;
private final String releaseClearingState;
private final String releaseContributors;
Expand Down Expand Up @@ -109,8 +109,8 @@ public class ComponentCSVRecord extends ComponentAwareCSVRecord {
String componentMailingList, String componentWiki, String componentBlog,
String componentWikipedia, String componentOpenHub,
String releaseName, String releaseVersion, String releaseDate, String CPEId,
String releaseCreatedOn, String releaseCreatedBy, String releaseRepostitoryURL,
String releaseRepostitoryType, String releaseMainlineState, String releaseClearingState,
String releaseCreatedOn, String releaseCreatedBy, String releaseRepositoryURL,
String releaseRepositoryType, String releaseMainlineState, String releaseClearingState,
String releaseContributors, String releaseModerators, String releaseSubscribers,
String releaseLanguages, String releaseOperatingSystems, String releaseMainLicenseIds,
String releaseDownloadURL, String vendorName, String vendorShortname, String vendorUrl,
Expand Down Expand Up @@ -148,8 +148,8 @@ public class ComponentCSVRecord extends ComponentAwareCSVRecord {
this.CPEId = CPEId;
this.releaseCreatedOn = releaseCreatedOn;
this.releaseCreatedBy = releaseCreatedBy;
this.releaseRepostitoryURL = releaseRepostitoryURL;
this.releaseRepostitoryType = releaseRepostitoryType;
this.releaseRepositoryURL = releaseRepositoryURL;
this.releaseRepositoryType = releaseRepositoryType;
this.releaseMainlineState = releaseMainlineState;
this.releaseClearingState = releaseClearingState;
this.releaseContributors = releaseContributors;
Expand Down Expand Up @@ -209,7 +209,7 @@ public boolean isSetRelease() {
}

public boolean isSetRepository() {
return isSetRelease() && !isNullOrEmpty(releaseRepostitoryURL);
return isSetRelease() && !isNullOrEmpty(releaseRepositoryURL);
}

public boolean isSetAttachmentContent() {return isValidUrl(releaseDownloadURL);}
Expand Down Expand Up @@ -472,13 +472,13 @@ public Release getRelease(String vendorId, String componentId, List<AttachmentCo


public Repository getRepository() {
if(releaseRepostitoryURL == null) return null;
if(releaseRepositoryURL == null) return null;

final Repository repository = new Repository();
repository.setUrl(releaseRepostitoryURL);
repository.setUrl(releaseRepositoryURL);

if (!isNullOrEmpty(releaseRepostitoryType)) {
final RepositoryType repositoryType = ThriftEnumUtils.stringToEnum(releaseRepostitoryType, RepositoryType.class);
if (!isNullOrEmpty(releaseRepositoryType)) {
final RepositoryType repositoryType = ThriftEnumUtils.stringToEnum(releaseRepositoryType, RepositoryType.class);
if (repositoryType != null)
repository.setRepositorytype(repositoryType);
}
Expand Down Expand Up @@ -651,8 +651,8 @@ public Iterable<String> getCSVIterable() {
elements.add(nullToEmptyString(CPEId));
elements.add(nullToEmptyString(releaseCreatedOn));
elements.add(nullToEmptyString(releaseCreatedBy));
elements.add(nullToEmptyString(releaseRepostitoryURL));
elements.add(nullToEmptyString(releaseRepostitoryType));
elements.add(nullToEmptyString(releaseRepositoryURL));
elements.add(nullToEmptyString(releaseRepositoryType));
elements.add(nullToEmptyString(releaseMainlineState));
elements.add(nullToEmptyString(releaseClearingState));
elements.add(nullToEmptyString(releaseContributors));
Expand Down Expand Up @@ -798,8 +798,8 @@ public static Iterable<String> getCSVHeaderIterable() {
elements.add("CPEId");
elements.add("releaseCreatedOn");
elements.add("releaseCreatedBy");
elements.add("releaseRepostitoryURL");
elements.add("releaseRepostitoryType");
elements.add("releaseRepositoryURL");
elements.add("releaseRepositoryType");
elements.add("releaseMainlineState");
elements.add("releaseClearingState");
elements.add("releaseContributors");
Expand Down Expand Up @@ -878,8 +878,8 @@ public String toString() {
", CPEId='" + CPEId + '\'' +
", releaseCreatedOn='" + releaseCreatedOn + '\'' +
", releaseCreatedBy='" + releaseCreatedBy + '\'' +
", releaseRepostitoryURL='" + releaseRepostitoryURL + '\'' +
", releaseRepostitoryType='" + releaseRepostitoryType + '\'' +
", releaseRepositoryURL='" + releaseRepositoryURL + '\'' +
", releaseRepositoryType='" + releaseRepositoryType + '\'' +
", releaseMainlineState='" + releaseMainlineState + '\'' +
", releaseClearingState='" + releaseClearingState + '\'' +
", releaseContributors='" + releaseContributors + '\'' +
Expand Down
28 changes: 14 additions & 14 deletions ...omponent-importer/src/main/java/org/eclipse/sw360/importer/ComponentCSVRecordBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ public class ComponentCSVRecordBuilder extends CustomizedCSVRecordBuilder<Compo
private String CPEId;
private String releaseCreatedOn;
private String releaseCreatedBy;
private String releaseRepostitoryURL;
private String releaseRepostitoryType;
private String releaseRepositoryURL;
private String releaseRepositoryType;
private String releaseMainlineState;
private String releaseClearingState;
private String releaseContributors;
Expand Down Expand Up @@ -107,8 +107,8 @@ public ComponentCSVRecord build() {
componentMailingList, componentWiki, componentBlog, componentWikipedia,
componentOpenHub,
releaseName, releaseVersion, releaseDate, CPEId,
releaseCreatedOn, releaseCreatedBy, releaseRepostitoryURL,
releaseRepostitoryType, releaseMainlineState, releaseClearingState,
releaseCreatedOn, releaseCreatedBy, releaseRepositoryURL,
releaseRepositoryType, releaseMainlineState, releaseClearingState,
releaseContributors, releaseModerators, releaseSubscribers,
releaseLanguages, releaseOperatingSystems, releaseMainLicenseNames,
releaseDownloadURL, vendorName, vendorShortname, vendorUrl, cIExternalSupplierID, cIAdditionalInfo, cIEvaluated,
Expand Down Expand Up @@ -144,8 +144,8 @@ public ComponentCSVRecord build() {
CPEId = null;
releaseCreatedOn = null;
releaseCreatedBy = null;
releaseRepostitoryURL = null;
releaseRepostitoryType = null;
releaseRepositoryURL = null;
releaseRepositoryType = null;
releaseMainlineState = null;
releaseClearingState = null;
releaseContributors = null;
Expand Down Expand Up @@ -216,8 +216,8 @@ public ComponentCSVRecord build() {
CPEId = record.get(i++);
releaseCreatedOn = record.get(i++);
releaseCreatedBy = record.get(i++);
releaseRepostitoryURL = record.get(i++);
releaseRepostitoryType = record.get(i++);
releaseRepositoryURL = record.get(i++);
releaseRepositoryType = record.get(i++);
releaseMainlineState = record.get(i++);
releaseClearingState = record.get(i++);
releaseContributors = record.get(i++);
Expand Down Expand Up @@ -349,8 +349,8 @@ public ComponentCSVRecordBuilder fill(EccInformation eccInfo) {
}

public ComponentCSVRecordBuilder fill(Repository repository) {
setReleaseRepostitoryType(getEnumStringOrNull(repository.getRepositorytype()));
setReleaseRepostitoryURL(repository.getUrl());
setReleaseRepositoryType(getEnumStringOrNull(repository.getRepositorytype()));
setReleaseRepositoryURL(repository.getUrl());
return this;
}

Expand Down Expand Up @@ -461,12 +461,12 @@ public void setReleaseCreatedBy(String releaseCreatedBy) {
this.releaseCreatedBy = releaseCreatedBy;
}

public void setReleaseRepostitoryURL(String releaseRepostitoryURL) {
this.releaseRepostitoryURL = releaseRepostitoryURL;
public void setReleaseRepositoryURL(String releaseRepositoryURL) {
this.releaseRepositoryURL = releaseRepositoryURL;
}

public void setReleaseRepostitoryType(String releaseRepostitoryType) {
this.releaseRepostitoryType = releaseRepostitoryType;
public void setReleaseRepositoryType(String releaseRepositoryType) {
this.releaseRepositoryType = releaseRepositoryType;
}

public void setReleaseMainlineState(String releaseMainlineState) {
Expand Down
2 changes: 1 addition & 1 deletion ...ters/component-importer/src/test/resources/org/eclipse/sw360/importer/test-components.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
'ComponentName','componentDescription','componentCreatedOn','componentType','componentCreatedBy','componentSubscribers','categories','softwarePlatforms','componentHomePage','componentMailingList','componentWiki','componentBlog','componentWikipedia','componentOpenHub','releaseName','releaseVersion','releaseDate','CPEId','releaseCreatedOn','releaseCreatedBy','releaseRepostitoryURL','releaseRepostitoryType','releaseMainlineState','releaseClearingState','releaseContributors','releaseModerators','releaseSubscribers','releaseLanguages','releaseOperatingSystems','releaseMainLicenseIds','releaseDownloadURL','vendorName','vendorShortname','vendorUrl','cIClick4SupplierID','cIAdditionalInfo','cIEvaluated','cIProcStart','cIRequestId','cIScanned','cIClStandard','cIComment','cISharePoint','cIBinariesOriginalFromCommunity','cIBinariesSelfMade','cIComponentLicenseInformation','cISourceCodeDelivery','cISourceCodeOriginalFromCommunity','cISourceCodeRExMade','cISourceCodeSelfMade','cIScreenshotOfWebSite','cIFinalizedLCR','cILCRScanResult','cILegalEvaluation','cILicenseAgreement','cIComponentClearingReport','cICountOfSecurityVn','eccStatus','eccAL','eccECCN','eccMaterialIndexNumber','eccComment','eccAssessorContactPerson','eccAssessorDepartment','eccAssessmentDate'
'ComponentName','componentDescription','componentCreatedOn','componentType','componentCreatedBy','componentSubscribers','categories','softwarePlatforms','componentHomePage','componentMailingList','componentWiki','componentBlog','componentWikipedia','componentOpenHub','releaseName','releaseVersion','releaseDate','CPEId','releaseCreatedOn','releaseCreatedBy','releaseRepositoryURL','releaseRepositoryType','releaseMainlineState','releaseClearingState','releaseContributors','releaseModerators','releaseSubscribers','releaseLanguages','releaseOperatingSystems','releaseMainLicenseIds','releaseDownloadURL','vendorName','vendorShortname','vendorUrl','cIClick4SupplierID','cIAdditionalInfo','cIEvaluated','cIProcStart','cIRequestId','cIScanned','cIClStandard','cIComment','cISharePoint','cIBinariesOriginalFromCommunity','cIBinariesSelfMade','cIComponentLicenseInformation','cISourceCodeDelivery','cISourceCodeOriginalFromCommunity','cISourceCodeRExMade','cISourceCodeSelfMade','cIScreenshotOfWebSite','cIFinalizedLCR','cILCRScanResult','cILegalEvaluation','cILicenseAgreement','cIComponentClearingReport','cICountOfSecurityVn','eccStatus','eccAL','eccECCN','eccMaterialIndexNumber','eccComment','eccAssessorContactPerson','eccAssessorDepartment','eccAssessmentDate'
'7-Zip',,'2015-06-10',,'ComponentImportUtilsTest@tngtech.com',,,,'http://commons.apache.org/proper/commons-exec',,,,,,'7-Zip','9.20.00.0',,,,'ComponentImportUtilsTest@tngtech.com',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'OPEN','AL1',,,'comment',,,
'7-Zip',,'2015-06-10',,'ComponentImportUtilsTest@tngtech.com',,,,,,,,,,'7-Zip','2.6',,,,'ComponentImportUtilsTest@tngtech.com',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'IN_PROGRESS',,'ECCN',,,,,
'angular-bootstrap-ui',,'2015-06-10',,'ComponentImportUtilsTest@tngtech.com',,,,,,,,,,'angular-bootstrap-ui','0.10.0',,,,'ComponentImportUtilsTest@tngtech.com',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,'MIN1',,,,
Expand Down

0 comments on commit e480824

Please sign in to comment.