X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.factory%2Fsrc%2Forg%2Fargeo%2Fslc%2Frpmfactory%2Fcore%2FRpmSpecFile.java;h=c9132f93fa85cddd1eb11dc9045ce46498511889;hb=2aed4ec1227628a9630471bddc0d903e7cb48eaa;hp=4b4db3b2e7f945aaf64a78c210a5eda60612fd4e;hpb=3b90a33b36baac839b376a71a4efcd90cacd3eac;p=gpl%2Fargeo-slc.git diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmSpecFile.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmSpecFile.java index 4b4db3b2e..c9132f93f 100644 --- a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmSpecFile.java +++ b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmSpecFile.java @@ -1,30 +1,14 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://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, - * 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. - */ package org.argeo.slc.rpmfactory.core; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.io.IOUtils; -import org.springframework.core.io.Resource; - public class RpmSpecFile { - private Resource specFile; + private Path specFile; private String name; private String version; @@ -32,7 +16,7 @@ public class RpmSpecFile { private Map sources = new HashMap(); private Map patches = new HashMap(); - public RpmSpecFile(Resource specFile) { + public RpmSpecFile(Path specFile) { this.specFile = specFile; parseSpecFile(); } @@ -41,11 +25,9 @@ public class RpmSpecFile { parseSpecFile(); } - @SuppressWarnings("unchecked") protected void parseSpecFile() { try { - List lines = (List) IOUtils.readLines(specFile - .getInputStream()); + List lines = (List) Files.readAllLines(specFile); lines: for (String line : lines) { int indexSemiColon = line.indexOf(':'); @@ -101,7 +83,7 @@ public class RpmSpecFile { return buf.toString(); } - public Resource getSpecFile() { + public Path getSpecFile() { return specFile; }