diff --git a/nl-agv/pom.xml b/nl-agv/pom.xml index 06b8a54..f847576 100644 --- a/nl-agv/pom.xml +++ b/nl-agv/pom.xml @@ -7,7 +7,6 @@ nl-tool-platform 3.0.0 - nl-agv 0.0.1-SNAPSHOT nl-agv diff --git a/nl-agv/src/main/java/org/nl/agv/service/AgvCarService.java b/nl-agv/src/main/java/org/nl/agv/service/AgvCarService.java deleted file mode 100644 index dfdcd2c..0000000 --- a/nl-agv/src/main/java/org/nl/agv/service/AgvCarService.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.nl.agv.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.agv.service.entity.AgvCar; -import org.nl.agv.service.mapper.AgvCarMapper; -import org.nl.layout.service.dto.MapLayout; -import org.nl.layout.service.entity.AgvLayoutMap; - -public interface AgvCarService extends IService { - -} diff --git a/nl-agv/src/main/java/org/nl/agv/service/impl/AgvCarServiceImpl.java b/nl-agv/src/main/java/org/nl/agv/service/impl/AgvCarServiceImpl.java deleted file mode 100644 index 11593ed..0000000 --- a/nl-agv/src/main/java/org/nl/agv/service/impl/AgvCarServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.nl.agv.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jakarta.annotation.Resource; -import org.nl.agv.service.AgvCarService; -import org.nl.agv.service.entity.AgvCar; -import org.nl.agv.service.mapper.AgvCarMapper; -import org.nl.common.localStorage.service.LocalStorageService; -import org.nl.common.localStorage.service.entity.LocalStorage; -import org.nl.layout.service.AgvLayoutService; -import org.nl.layout.service.dto.DeviceLayout; -import org.nl.layout.service.dto.MapLayout; -import org.nl.layout.service.entity.AgvLayoutDevice; -import org.nl.layout.service.entity.AgvLayoutMap; -import org.nl.layout.service.mapper.AgvLayoutDeviceMapper; -import org.nl.layout.service.mapper.AgvLayoutMapMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.util.List; - - -@Service -public class AgvCarServiceImpl extends ServiceImpl implements AgvCarService { - -} diff --git a/nl-agv/src/main/java/org/nl/core/AgvConfig.java b/nl-agv/src/main/java/org/nl/core/AgvConfig.java new file mode 100644 index 0000000..e4f2c66 --- /dev/null +++ b/nl-agv/src/main/java/org/nl/core/AgvConfig.java @@ -0,0 +1,4 @@ +package org.nl.core; + +public class AgvConfig { +} diff --git a/nl-agv/src/main/java/org/nl/core/AgvEnum.java b/nl-agv/src/main/java/org/nl/core/AgvEnum.java new file mode 100644 index 0000000..a44e078 --- /dev/null +++ b/nl-agv/src/main/java/org/nl/core/AgvEnum.java @@ -0,0 +1,4 @@ +package org.nl.core; + +public enum AgvEnum { +} diff --git a/nl-agv/src/main/java/org/nl/layout/service/mapper/AgvLayoutDeviceMapper.java b/nl-agv/src/main/java/org/nl/layout/service/mapper/AgvLayoutDeviceMapper.java deleted file mode 100644 index 69d8436..0000000 --- a/nl-agv/src/main/java/org/nl/layout/service/mapper/AgvLayoutDeviceMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.nl.layout.service.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Insert; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Options; -import org.nl.common.localStorage.service.entity.LocalStorage; -import org.nl.layout.service.entity.AgvLayoutDevice; - -@Mapper -public interface AgvLayoutDeviceMapper extends BaseMapper { - - -} diff --git a/nl-agv/src/main/java/org/nl/agv/controller/AgvCarController.java b/nl-agv/src/main/java/org/nl/module/agv/controller/AgvCarController.java similarity index 94% rename from nl-agv/src/main/java/org/nl/agv/controller/AgvCarController.java rename to nl-agv/src/main/java/org/nl/module/agv/controller/AgvCarController.java index 9bb3057..350d827 100644 --- a/nl-agv/src/main/java/org/nl/agv/controller/AgvCarController.java +++ b/nl-agv/src/main/java/org/nl/module/agv/controller/AgvCarController.java @@ -10,19 +10,18 @@ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip */ -package org.nl.agv.controller; +package org.nl.module.agv.controller; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.StringUtils; -import org.nl.agv.service.AgvCarService; -import org.nl.agv.service.entity.AgvCar; -import org.nl.agv.service.query.AgvCarQuery; +import org.nl.module.agv.service.AgvCarService; +import org.nl.module.agv.entity.AgvCar; +import org.nl.module.agv.dto.AgvCarQuery; import org.nl.common.page.PageQuery; import org.nl.common.pojo.CommonResult; -import org.nl.agv.service.dto.AgvStatus; +import org.nl.module.agv.dto.AgvStatus; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/nl-agv/src/main/java/org/nl/agv/service/query/AgvCarQuery.java b/nl-agv/src/main/java/org/nl/module/agv/dto/AgvCarQuery.java similarity index 60% rename from nl-agv/src/main/java/org/nl/agv/service/query/AgvCarQuery.java rename to nl-agv/src/main/java/org/nl/module/agv/dto/AgvCarQuery.java index 6bc0745..e6b19f7 100644 --- a/nl-agv/src/main/java/org/nl/agv/service/query/AgvCarQuery.java +++ b/nl-agv/src/main/java/org/nl/module/agv/dto/AgvCarQuery.java @@ -1,8 +1,7 @@ -package org.nl.agv.service.query; +package org.nl.module.agv.dto; -import org.nl.agv.service.entity.AgvCar; +import org.nl.module.agv.entity.AgvCar; import org.nl.common.page.BaseQuery; -import org.nl.layout.service.entity.AgvLayoutMap; public class AgvCarQuery extends BaseQuery { @Override diff --git a/nl-agv/src/main/java/org/nl/agv/service/dto/AgvStatus.java b/nl-agv/src/main/java/org/nl/module/agv/dto/AgvStatus.java similarity index 97% rename from nl-agv/src/main/java/org/nl/agv/service/dto/AgvStatus.java rename to nl-agv/src/main/java/org/nl/module/agv/dto/AgvStatus.java index bf48759..9b3a745 100644 --- a/nl-agv/src/main/java/org/nl/agv/service/dto/AgvStatus.java +++ b/nl-agv/src/main/java/org/nl/module/agv/dto/AgvStatus.java @@ -1,4 +1,4 @@ -package org.nl.agv.service.dto; +package org.nl.module.agv.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/nl-agv/src/main/java/org/nl/agv/service/entity/AgvCar.java b/nl-agv/src/main/java/org/nl/module/agv/entity/AgvCar.java similarity index 95% rename from nl-agv/src/main/java/org/nl/agv/service/entity/AgvCar.java rename to nl-agv/src/main/java/org/nl/module/agv/entity/AgvCar.java index 74fa1e3..aca9430 100644 --- a/nl-agv/src/main/java/org/nl/agv/service/entity/AgvCar.java +++ b/nl-agv/src/main/java/org/nl/module/agv/entity/AgvCar.java @@ -1,4 +1,4 @@ -package org.nl.agv.service.entity; +package org.nl.module.agv.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/nl-agv/src/main/java/org/nl/agv/service/mapper/AgvCarMapper.java b/nl-agv/src/main/java/org/nl/module/agv/mapper/AgvCarMapper.java similarity index 69% rename from nl-agv/src/main/java/org/nl/agv/service/mapper/AgvCarMapper.java rename to nl-agv/src/main/java/org/nl/module/agv/mapper/AgvCarMapper.java index 56115bb..294aa12 100644 --- a/nl-agv/src/main/java/org/nl/agv/service/mapper/AgvCarMapper.java +++ b/nl-agv/src/main/java/org/nl/module/agv/mapper/AgvCarMapper.java @@ -1,8 +1,8 @@ -package org.nl.agv.service.mapper; +package org.nl.module.agv.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.nl.agv.service.entity.AgvCar; +import org.nl.module.agv.entity.AgvCar; @Mapper public interface AgvCarMapper extends BaseMapper { diff --git a/nl-agv/src/main/java/org/nl/module/agv/service/AgvCarService.java b/nl-agv/src/main/java/org/nl/module/agv/service/AgvCarService.java new file mode 100644 index 0000000..374b43d --- /dev/null +++ b/nl-agv/src/main/java/org/nl/module/agv/service/AgvCarService.java @@ -0,0 +1,8 @@ +package org.nl.module.agv.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.module.agv.entity.AgvCar; + +public interface AgvCarService extends IService { + +} diff --git a/nl-agv/src/main/java/org/nl/module/agv/service/impl/AgvCarServiceImpl.java b/nl-agv/src/main/java/org/nl/module/agv/service/impl/AgvCarServiceImpl.java new file mode 100644 index 0000000..4a563ad --- /dev/null +++ b/nl-agv/src/main/java/org/nl/module/agv/service/impl/AgvCarServiceImpl.java @@ -0,0 +1,13 @@ +package org.nl.module.agv.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.module.agv.entity.AgvCar; +import org.nl.module.agv.mapper.AgvCarMapper; +import org.nl.module.agv.service.AgvCarService; +import org.springframework.stereotype.Service; + + +@Service +public class AgvCarServiceImpl extends ServiceImpl implements AgvCarService { + +} diff --git a/nl-agv/src/main/java/org/nl/layout/controller/AgvLayoutController.java b/nl-agv/src/main/java/org/nl/module/layout/controller/AgvLayoutController.java similarity index 89% rename from nl-agv/src/main/java/org/nl/layout/controller/AgvLayoutController.java rename to nl-agv/src/main/java/org/nl/module/layout/controller/AgvLayoutController.java index 6a305ab..6ea5afd 100644 --- a/nl-agv/src/main/java/org/nl/layout/controller/AgvLayoutController.java +++ b/nl-agv/src/main/java/org/nl/module/layout/controller/AgvLayoutController.java @@ -10,7 +10,7 @@ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。 * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip */ -package org.nl.layout.controller; +package org.nl.module.layout.controller; import cn.dev33.satoken.annotation.SaIgnore; @@ -18,23 +18,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.tags.Tag; -import org.nl.agv.service.AgvCarService; import org.nl.common.exception.CommonException; import org.nl.common.page.PageQuery; import org.nl.common.pojo.CommonResult; -import org.nl.agv.service.dto.AgvStatus; -import org.nl.layout.service.AgvLayoutService; -import org.nl.layout.service.dto.MapLayout; -import org.nl.layout.service.entity.AgvLayoutMap; -import org.nl.layout.service.query.MapLayoutQuery; +import org.nl.module.layout.service.AgvLayoutService; +import org.nl.module.layout.service.dto.MapLayout; +import org.nl.module.layout.service.entity.AgvLayoutMap; +import org.nl.module.layout.service.query.MapLayoutQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - @Tag(name = "AGV模块") @RestController() @RequestMapping("/api/agv/map") diff --git a/nl-agv/src/main/java/org/nl/layout/service/AgvLayoutService.java b/nl-agv/src/main/java/org/nl/module/layout/service/AgvLayoutService.java similarity index 64% rename from nl-agv/src/main/java/org/nl/layout/service/AgvLayoutService.java rename to nl-agv/src/main/java/org/nl/module/layout/service/AgvLayoutService.java index e741bd1..fa05eec 100644 --- a/nl-agv/src/main/java/org/nl/layout/service/AgvLayoutService.java +++ b/nl-agv/src/main/java/org/nl/module/layout/service/AgvLayoutService.java @@ -1,8 +1,8 @@ -package org.nl.layout.service; +package org.nl.module.layout.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.layout.service.dto.MapLayout; -import org.nl.layout.service.entity.AgvLayoutMap; +import org.nl.module.layout.service.dto.MapLayout; +import org.nl.module.layout.service.entity.AgvLayoutMap; public interface AgvLayoutService extends IService { diff --git a/nl-agv/src/main/java/org/nl/layout/service/dto/DeviceLayout.java b/nl-agv/src/main/java/org/nl/module/layout/service/dto/DeviceLayout.java similarity index 87% rename from nl-agv/src/main/java/org/nl/layout/service/dto/DeviceLayout.java rename to nl-agv/src/main/java/org/nl/module/layout/service/dto/DeviceLayout.java index 8a6091a..a68024d 100644 --- a/nl-agv/src/main/java/org/nl/layout/service/dto/DeviceLayout.java +++ b/nl-agv/src/main/java/org/nl/module/layout/service/dto/DeviceLayout.java @@ -1,4 +1,4 @@ -package org.nl.layout.service.dto; +package org.nl.module.layout.service.dto; import lombok.Data; diff --git a/nl-agv/src/main/java/org/nl/layout/service/dto/MapLayout.java b/nl-agv/src/main/java/org/nl/module/layout/service/dto/MapLayout.java similarity index 85% rename from nl-agv/src/main/java/org/nl/layout/service/dto/MapLayout.java rename to nl-agv/src/main/java/org/nl/module/layout/service/dto/MapLayout.java index f07bad8..c9ad8e1 100644 --- a/nl-agv/src/main/java/org/nl/layout/service/dto/MapLayout.java +++ b/nl-agv/src/main/java/org/nl/module/layout/service/dto/MapLayout.java @@ -1,4 +1,4 @@ -package org.nl.layout.service.dto; +package org.nl.module.layout.service.dto; import lombok.Data; diff --git a/nl-agv/src/main/java/org/nl/layout/service/dto/MapOrigin.java b/nl-agv/src/main/java/org/nl/module/layout/service/dto/MapOrigin.java similarity index 70% rename from nl-agv/src/main/java/org/nl/layout/service/dto/MapOrigin.java rename to nl-agv/src/main/java/org/nl/module/layout/service/dto/MapOrigin.java index e920a96..7b018f1 100644 --- a/nl-agv/src/main/java/org/nl/layout/service/dto/MapOrigin.java +++ b/nl-agv/src/main/java/org/nl/module/layout/service/dto/MapOrigin.java @@ -1,4 +1,4 @@ -package org.nl.layout.service.dto; +package org.nl.module.layout.service.dto; import lombok.Data; diff --git a/nl-agv/src/main/java/org/nl/layout/service/entity/AgvLayoutDevice.java b/nl-agv/src/main/java/org/nl/module/layout/service/entity/AgvLayoutDevice.java similarity index 94% rename from nl-agv/src/main/java/org/nl/layout/service/entity/AgvLayoutDevice.java rename to nl-agv/src/main/java/org/nl/module/layout/service/entity/AgvLayoutDevice.java index 8549caf..817fe7e 100644 --- a/nl-agv/src/main/java/org/nl/layout/service/entity/AgvLayoutDevice.java +++ b/nl-agv/src/main/java/org/nl/module/layout/service/entity/AgvLayoutDevice.java @@ -1,4 +1,4 @@ -package org.nl.layout.service.entity; +package org.nl.module.layout.service.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/nl-agv/src/main/java/org/nl/layout/service/entity/AgvLayoutMap.java b/nl-agv/src/main/java/org/nl/module/layout/service/entity/AgvLayoutMap.java similarity index 94% rename from nl-agv/src/main/java/org/nl/layout/service/entity/AgvLayoutMap.java rename to nl-agv/src/main/java/org/nl/module/layout/service/entity/AgvLayoutMap.java index ac6d680..a26f8ee 100644 --- a/nl-agv/src/main/java/org/nl/layout/service/entity/AgvLayoutMap.java +++ b/nl-agv/src/main/java/org/nl/module/layout/service/entity/AgvLayoutMap.java @@ -1,4 +1,4 @@ -package org.nl.layout.service.entity; +package org.nl.module.layout.service.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/nl-agv/src/main/java/org/nl/layout/service/impl/AgvLayoutServiceImpl.java b/nl-agv/src/main/java/org/nl/module/layout/service/impl/AgvLayoutServiceImpl.java similarity index 74% rename from nl-agv/src/main/java/org/nl/layout/service/impl/AgvLayoutServiceImpl.java rename to nl-agv/src/main/java/org/nl/module/layout/service/impl/AgvLayoutServiceImpl.java index 33dec53..02997d4 100644 --- a/nl-agv/src/main/java/org/nl/layout/service/impl/AgvLayoutServiceImpl.java +++ b/nl-agv/src/main/java/org/nl/module/layout/service/impl/AgvLayoutServiceImpl.java @@ -1,29 +1,20 @@ -package org.nl.layout.service.impl; +package org.nl.module.layout.service.impl; import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import org.nl.common.exception.CommonException; import org.nl.common.localStorage.service.LocalStorageService; -import org.nl.common.localStorage.service.mapper.LocalStorageMapper; import org.nl.common.localStorage.service.entity.LocalStorage; -import org.nl.common.util.FileProperties; -import org.nl.common.util.FileUtil; -import org.nl.layout.service.AgvLayoutService; -import org.nl.layout.service.dto.DeviceLayout; -import org.nl.layout.service.dto.MapLayout; -import org.nl.layout.service.entity.AgvLayoutDevice; -import org.nl.layout.service.entity.AgvLayoutMap; -import org.nl.layout.service.mapper.AgvLayoutDeviceMapper; -import org.nl.layout.service.mapper.AgvLayoutMapMapper; +import org.nl.module.layout.service.AgvLayoutService; +import org.nl.module.layout.service.dto.DeviceLayout; +import org.nl.module.layout.service.dto.MapLayout; +import org.nl.module.layout.service.entity.AgvLayoutDevice; +import org.nl.module.layout.service.entity.AgvLayoutMap; +import org.nl.module.layout.service.mapper.AgvLayoutDeviceMapper; +import org.nl.module.layout.service.mapper.AgvLayoutMapMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import org.springframework.web.multipart.MultipartFile; -import java.io.File; -import java.io.IOException; import java.util.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/nl-agv/src/main/java/org/nl/module/layout/service/mapper/AgvLayoutDeviceMapper.java b/nl-agv/src/main/java/org/nl/module/layout/service/mapper/AgvLayoutDeviceMapper.java new file mode 100644 index 0000000..6da4098 --- /dev/null +++ b/nl-agv/src/main/java/org/nl/module/layout/service/mapper/AgvLayoutDeviceMapper.java @@ -0,0 +1,11 @@ +package org.nl.module.layout.service.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.nl.module.layout.service.entity.AgvLayoutDevice; + +@Mapper +public interface AgvLayoutDeviceMapper extends BaseMapper { + + +} diff --git a/nl-agv/src/main/java/org/nl/layout/service/mapper/AgvLayoutMapMapper.java b/nl-agv/src/main/java/org/nl/module/layout/service/mapper/AgvLayoutMapMapper.java similarity index 74% rename from nl-agv/src/main/java/org/nl/layout/service/mapper/AgvLayoutMapMapper.java rename to nl-agv/src/main/java/org/nl/module/layout/service/mapper/AgvLayoutMapMapper.java index d9e753b..f61607a 100644 --- a/nl-agv/src/main/java/org/nl/layout/service/mapper/AgvLayoutMapMapper.java +++ b/nl-agv/src/main/java/org/nl/module/layout/service/mapper/AgvLayoutMapMapper.java @@ -1,12 +1,11 @@ -package org.nl.layout.service.mapper; +package org.nl.module.layout.service.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Options; -import org.nl.common.localStorage.service.entity.LocalStorage; -import org.nl.layout.service.dto.MapLayout; -import org.nl.layout.service.entity.AgvLayoutMap; +import org.nl.module.layout.service.dto.MapLayout; +import org.nl.module.layout.service.entity.AgvLayoutMap; @Mapper public interface AgvLayoutMapMapper extends BaseMapper { diff --git a/nl-agv/src/main/java/org/nl/layout/service/mapper/mapping/AgvLayoutMapMapper.xml b/nl-agv/src/main/java/org/nl/module/layout/service/mapper/mapping/AgvLayoutMapMapper.xml similarity index 84% rename from nl-agv/src/main/java/org/nl/layout/service/mapper/mapping/AgvLayoutMapMapper.xml rename to nl-agv/src/main/java/org/nl/module/layout/service/mapper/mapping/AgvLayoutMapMapper.xml index a99de2f..69ae96c 100644 --- a/nl-agv/src/main/java/org/nl/layout/service/mapper/mapping/AgvLayoutMapMapper.xml +++ b/nl-agv/src/main/java/org/nl/module/layout/service/mapper/mapping/AgvLayoutMapMapper.xml @@ -1,20 +1,20 @@ - + - + - + - + diff --git a/nl-agv/src/main/java/org/nl/layout/service/query/MapLayoutQuery.java b/nl-agv/src/main/java/org/nl/module/layout/service/query/MapLayoutQuery.java similarity index 67% rename from nl-agv/src/main/java/org/nl/layout/service/query/MapLayoutQuery.java rename to nl-agv/src/main/java/org/nl/module/layout/service/query/MapLayoutQuery.java index 5a132ef..f431b57 100644 --- a/nl-agv/src/main/java/org/nl/layout/service/query/MapLayoutQuery.java +++ b/nl-agv/src/main/java/org/nl/module/layout/service/query/MapLayoutQuery.java @@ -1,7 +1,7 @@ -package org.nl.layout.service.query; +package org.nl.module.layout.service.query; import org.nl.common.page.BaseQuery; -import org.nl.layout.service.entity.AgvLayoutMap; +import org.nl.module.layout.service.entity.AgvLayoutMap; public class MapLayoutQuery extends BaseQuery { @Override diff --git a/nl-provider-api/.gitattributes b/nl-provider-api/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/nl-provider-api/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/nl-provider-api/.mvn/wrapper/maven-wrapper.properties b/nl-provider-api/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..8dea6c2 --- /dev/null +++ b/nl-provider-api/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip diff --git a/nl-provider-api/mvnw b/nl-provider-api/mvnw new file mode 100755 index 0000000..bd8896b --- /dev/null +++ b/nl-provider-api/mvnw @@ -0,0 +1,295 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.4 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/nl-provider-api/mvnw.cmd b/nl-provider-api/mvnw.cmd new file mode 100644 index 0000000..92450f9 --- /dev/null +++ b/nl-provider-api/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/nl-provider-api/pom.xml b/nl-provider-api/pom.xml new file mode 100644 index 0000000..8fda339 --- /dev/null +++ b/nl-provider-api/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 4.0.2 + + + org.nl + nl-provider-api + 0.0.1-SNAPSHOT + nl-provider-api + nl-provider-api + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/nl-provider-api/src/main/java/org/nl/nlproviderapi/NlProviderApiApplication.java b/nl-provider-api/src/main/java/org/nl/nlproviderapi/NlProviderApiApplication.java new file mode 100644 index 0000000..68242cc --- /dev/null +++ b/nl-provider-api/src/main/java/org/nl/nlproviderapi/NlProviderApiApplication.java @@ -0,0 +1,13 @@ +package org.nl.nlproviderapi; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class NlProviderApiApplication { + + public static void main(String[] args) { + SpringApplication.run(NlProviderApiApplication.class, args); + } + +} diff --git a/nl-provider-api/src/main/resources/application.properties b/nl-provider-api/src/main/resources/application.properties new file mode 100644 index 0000000..a53199d --- /dev/null +++ b/nl-provider-api/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=nl-provider-api diff --git a/nl-provider-api/src/test/java/org/nl/nlproviderapi/NlProviderApiApplicationTests.java b/nl-provider-api/src/test/java/org/nl/nlproviderapi/NlProviderApiApplicationTests.java new file mode 100644 index 0000000..6dc5a75 --- /dev/null +++ b/nl-provider-api/src/test/java/org/nl/nlproviderapi/NlProviderApiApplicationTests.java @@ -0,0 +1,13 @@ +package org.nl.nlproviderapi; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class NlProviderApiApplicationTests { + + @Test + void contextLoads() { + } + +}